From a8e00e2169320f6d500fdbdc77ded9c9a689dc82 Mon Sep 17 00:00:00 2001 From: Elliot Lee Date: Tue, 15 Dec 1998 23:59:44 +0000 Subject: [PATCH] Use G_IO_ERR|G_IO_HUP|G_IO_NVAL as the mask for checking for 1998-12-15 Elliot Lee * gdk/gdkevents.c: Use G_IO_ERR|G_IO_HUP|G_IO_NVAL as the mask for checking for GDK_INPUT_EXCEPTION events. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/gdkevents.c | 5 ++--- gdk/x11/gdkevents-x11.c | 5 ++--- 9 files changed, 39 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e22382899..71fe2f8551 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1998-12-15 Elliot Lee + + * gdk/gdkevents.c: Use G_IO_ERR|G_IO_HUP|G_IO_NVAL + as the mask for checking for GDK_INPUT_EXCEPTION events. + 1998-12-15 Martin Baulig * acinclude.m4: Make the gettext check for for libc5 systems. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 6e22382899..71fe2f8551 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +1998-12-15 Elliot Lee + + * gdk/gdkevents.c: Use G_IO_ERR|G_IO_HUP|G_IO_NVAL + as the mask for checking for GDK_INPUT_EXCEPTION events. + 1998-12-15 Martin Baulig * acinclude.m4: Make the gettext check for for libc5 systems. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6e22382899..71fe2f8551 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +1998-12-15 Elliot Lee + + * gdk/gdkevents.c: Use G_IO_ERR|G_IO_HUP|G_IO_NVAL + as the mask for checking for GDK_INPUT_EXCEPTION events. + 1998-12-15 Martin Baulig * acinclude.m4: Make the gettext check for for libc5 systems. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 6e22382899..71fe2f8551 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +1998-12-15 Elliot Lee + + * gdk/gdkevents.c: Use G_IO_ERR|G_IO_HUP|G_IO_NVAL + as the mask for checking for GDK_INPUT_EXCEPTION events. + 1998-12-15 Martin Baulig * acinclude.m4: Make the gettext check for for libc5 systems. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6e22382899..71fe2f8551 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +1998-12-15 Elliot Lee + + * gdk/gdkevents.c: Use G_IO_ERR|G_IO_HUP|G_IO_NVAL + as the mask for checking for GDK_INPUT_EXCEPTION events. + 1998-12-15 Martin Baulig * acinclude.m4: Make the gettext check for for libc5 systems. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6e22382899..71fe2f8551 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +1998-12-15 Elliot Lee + + * gdk/gdkevents.c: Use G_IO_ERR|G_IO_HUP|G_IO_NVAL + as the mask for checking for GDK_INPUT_EXCEPTION events. + 1998-12-15 Martin Baulig * acinclude.m4: Make the gettext check for for libc5 systems. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6e22382899..71fe2f8551 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +1998-12-15 Elliot Lee + + * gdk/gdkevents.c: Use G_IO_ERR|G_IO_HUP|G_IO_NVAL + as the mask for checking for GDK_INPUT_EXCEPTION events. + 1998-12-15 Martin Baulig * acinclude.m4: Make the gettext check for for libc5 systems. diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index 2e771f58bf..8ddf913da7 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -763,9 +763,8 @@ gdk_input_add_full (gint source, cond |= (G_IO_IN | G_IO_PRI); if (condition & GDK_INPUT_WRITE) cond |= G_IO_OUT; - /* The things that correspond to GDK_INPUT_EXCEPTION don't - * need to be added to events - */ + if (condition & GDK_INPUT_EXCEPTION) + cond |= G_IO_ERR|G_IO_HUP|G_IO_NVAL; channel = g_io_channel_unix_new (source); result = g_io_add_watch_full (channel, 0, cond, gdk_io_invoke, diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c index 2e771f58bf..8ddf913da7 100644 --- a/gdk/x11/gdkevents-x11.c +++ b/gdk/x11/gdkevents-x11.c @@ -763,9 +763,8 @@ gdk_input_add_full (gint source, cond |= (G_IO_IN | G_IO_PRI); if (condition & GDK_INPUT_WRITE) cond |= G_IO_OUT; - /* The things that correspond to GDK_INPUT_EXCEPTION don't - * need to be added to events - */ + if (condition & GDK_INPUT_EXCEPTION) + cond |= G_IO_ERR|G_IO_HUP|G_IO_NVAL; channel = g_io_channel_unix_new (source); result = g_io_add_watch_full (channel, 0, cond, gdk_io_invoke, -- 2.30.2